Fixed some notices, added sanitisation to the validation
Merge branch '0-6-0-BRANCH' of https://github.com/careck/cmfive into 0-6-0-BRANCH