Clean up whitespace
Merge pull request #31 from fyfe/fix-whitespace

Clean up whitespace.

Thx to fyfe
Version bump
Version bump
Version Bump
Version Bump
Version Bump

Some fixes and multi-character support thanks to fyfe