Updated changelog with merged pull requests #887 and #931