Merge pull request #3 from natam/dev

Dev
Merge pull request #4 from natam/master

Merge pull request #3 from natam/dev