Fixing #57
Merge branch '2.0' of github.com:thecodingmachine/mouf into 2.0