Merge branch 'master' into text-input
Merge branch 'text-input' of https://github.com/mmhl/ctypist into text-input
Various small changes in sources