Resolves Issue #235 and #246
Fixes ChangeLog after merge from 2.3.x
Fixes PEP8 issues