Added some comments
Fixed a spelling mistake
Merge branch 'master' into develop