Update changelog
Update changelog
Merge pull request #261 from sozler/dev

Update changelog