Pre-release 2.0.0 cleanup

Fixes #167

Updated changelog with fix info

closes #167