Merge pull request #107 from blkperl/travis_update