Merge pull request #1 from igorbonadio/master

Likely belongs to Stormcoders
travis-ci