Merge branches 'master' and 'develop' into develop
typo corrected
minor cleanup
minor cleanup the cleanup
variable cleanup