Revert "Merge pull request #2 from hector3/dev"
Merge pull request #4 from hector3/revert-3-master

Revert "Merge pull request #2 from hector3/dev"