v3.10 - bug fixes
Merge branch 'new-features' of https://github.com/Thalassicus/cep-bnw into new-features