Merge pull request #1 from kjnsn/master

Added travis support