Fixed issue: 226.
Updating changelog to reflect all changes in wip-1.0 and where they come from