Merge pull request #16 from datanium/master

pull
minor improvements
Merge pull request #117 from benitoro/master

minor improvements