Merge pull request #17 from tHoki/travis

Travis