Update based on Peach feedback
Fix typo
Merge pull request #4 from shinrich/master

Updated based on Peach feedback