Fixed typo #35
Merge branch 'master' into develop