Merge pull request #6 from gayanW/travis