Merge pull request #95 from fire/travis-pull-request