Moved code from `piston`
Merge pull request #1 from Coeuvre/master

Moved code from `piston`