Merge pull request #14 from datanium/master

pull
Merge pull request #71 from benitoro/master

Merge pull request #14 from datanium/master