Adds updates
Merge pull request #58 from apeniche/master

Adds updates