Merge pull request #27 from michelgrootjans/master

First steps towards internationalisation
Merge remote-tracking branch 'upstream/master'