Addressed #22. Please review