first commit, done with 3.1
Merge branch 'master' of https://github.com/mseln/mustached-ninja