Merge pull request #31 from meklu/master

Cleaning up some localisation stuff, fixes #30