Fix #18
Resolve #17
Update changelog