Merge pull request #152 from sbliven/cecpshorter

CE-CP 1.4