travis
Merge pull request #2 from masarakki/travis

travis