Fixed typos and some inconsistency
Merge pull request #4 from cvanball/master

Fixed typos and some inconsistency