update after review
Merge pull request #4 from forumbyr/master

update after review