Fixed mistakes in my bug fix
Merge pull request #13 from smilefreak/master

Fixed mistakes in my bug fix