Merge pull request #105 from hmert/master

travis