Merge pull request #100 from jcarlosgarcia/master

Merge heroku