Cleaning up some localisation stuff, fixes #30

This should fix #30.