Actual fix for Issue #365
Updated changelog
Bumped versions.