Commiting changes on dev
Merge pull request #1 from jeoliva/dev

Commiting changes on dev