Merge pull request #2 from mdewolfe/develop

Travis CI Integration