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