Merge pull request #102 from johannesfrey/detox

Detox