Dev

Merging all the changes for this release together