fixed minor typos and bugs
Merge remote-tracking branch 'upstream/master'
fixed minor typo
Merge pull request #3 from Danghor/master

fixed typos and bugs