Merge pull request #117 from enzococca/master

Merge pull request #3 from pyarchinit/master
Merge pull request #4 from pyarchinit/master

Merge pull request #117 from enzococca/master