Merge pull request #31 from Porquepix/master

Merge pull request #29 from Porquepix/VersionLocal
Merge pull request #33 from Porquepix/VersionLocal

Merge pull request #31 from Porquepix/master