Merge pull request #6 from rail/tox

Tox