corrected spelling mistake in comment
fixed typos
Merge branch 'master' into develop