make changes to accept ricardogarfe's work to integrate with travis-ci
Merge branch 'ricardogarfe-master'