Small changes
Merge branch '0-8-0-BRANCH' of https://github.com/careck/cmfive into 0-8-0-BRANCH