Merge pull request #102 from RyDroid/travis