Fixed some typos in the help message and README
Merge branch 'develop'