Merge upstream
Merge branch 'master' of https://github.com/mannol1/toxic