Extra consistency checks
Merge branch 'master' of github.com:mrBliss/cpl-dsl