Merge pull request #2 from pi-engine/master

Update from main repo
Merge pull request #3 from pi-engine/master

update from main repo
Improve local support
Merge pull request #45 from voltan/master

Improve localization