Merge pull request #18 from dodecaphonic/master

Fix setting of default keymap (#17).
Fix typo
Merge pull request #20 from Trevoke/patch-1

Fix typo