Minor edits for merge conflict
Merge branch 'master' of https://github.com/Thalassicus/cepbasic