Merge pull request #3 from whatasunnyday/travis

Travis