Merge pull request #1 from tokibito/master

Testing with tox at TravisCI