Update changelog, closes #7, closes #9