Merge branch 'master' into hotfix
v0.3.1

A fix that should correct language issues on international machines.
Merge branch 'hotfix'