Changelog, cleanup and fix for #44