Work on issue #270
Update changelog for issue #270