Merge pull request #56 from branan/travisci