fixed typo
fixed typo and bug
Merge pull request #16 from Danghor/master

Fixed typos and a bug