MadDuck team initial pull request! \o/