Merge pull request #2 from hector3/dev

Dev
Merge pull request #3 from hector3/master

Merge pull request #2 from hector3/dev