Merge pull request #225 from cdallas/master

localization
Merge pull request #34 from ZooTypers/master

update