Merge pull request #1392 from toopay/travis-ci

Travis ci