I think (hope?) this nicely addresses the points raised in #135

This closes #135.
Update to the CHANGELOG