Merge pull request #21 from Porquepix/master

Merge pull request #19 from Porquepix/VersionLocal