Merge pull request #6 from pyarchinit/master

merge
Merge pull request #95 from enzococca/master

Merge pull request #6 from pyarchinit/master