Updated changelog
Closed #105 and #175