Update changelog: recent changes + #14 and #16