Merge pull request #3 from GrayHatter/master

merged changes from master with a few developments on top of that
Spelling fixes in readme.
hotfix for my damage, still unworking
Merge branch 'hotfix/mergefix'