Merge pull request #66 from jcarlosgarcia/master

Merge from heroku