Want to move to master

This is all the changes in development moved to master