Fixed weird typos
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
Updated documentation
Updated documentation
Updated documentation