More unity in the word 'key'
Merge pull request #40 from theemstra/patch-3

More unity, small changes