Fixed #33 and change .travis.yml