Merge pull request #2 from hector3/dev

Dev