Bugfix for #89
Update CHANGELOG