Fix for #177
update change log for #171 and #177