Fixed some typos
Merge branch 'develop'
Merge pull request #9 from riker09/master

Fixed some typos and code convention