jojo- Merge pull request #3 from okrebs/code_review