fixes for localization, etc
Merge pull request #22 from protherj/qa

fixes for localization, etc