Merge pull request #40 from McSinyx/travis