This should take care of Localization
Merge pull request #113 from emris/MoreLocalizing

This should take care of Localization