Fixed some typo's in the comments
Merge branch 'master' into development
Merge pull request #4 from ding2tal/core-pr-5

Core pr 5