Merge pull request #3 from yohoushi/travis