closes #14, fixes translation formatting
Merge branch 'master' of github.com:hltdi/guampa