1.0 changes into development
Merge updates from 1.0 branch back into development
For work to continue on the development branch, it should be based on the updates that were made for the 1.0 release