Merge pull request #32 from ZooTypers/master

update
Merge pull request #33 from ZooTypers/master

update
final localization
Merge pull request #225 from cdallas/master

localization