Updating changelog
Merge branch 'pr276' into develop