Merge pull request #6 from witspirit/master
Merge branch 'master' into feature_spellchecker