more fixes
Merge branch '2.0dev' of https://github.com/WebTales/rubedo into 2.0dev