close #354; fixes #374; close #131; Update CHANGELOG for PR for #375