Merge pull request #31 from cwhite21/master

Improved Localization and Config