Feature/mocha enchant 0.8.1