Fix #27
Update Changelog