mistakes
Merge pull request #20 from oompt/master

mistakes