Merge pull request #35 from Porquepix/VersionLocal

Merge pull request #34 from Porquepix/master
Merge pull request #36 from Porquepix/master

Merge pull request #35 from Porquepix/VersionLocal