Typo fixed
Typo fixes and phrase reformulation
Fixes Merge branch conflict from 'patches'

Conflicts:
	docs/modules.rst
Merge pull request #17 from ThyArmageddon/master

Please read carefully before merging