Merged dev into master

This contains the changes to add in copy