Merge pull request #107 from maxlinc/travis

Travis