Merged dev into mastercleanup branch to clean up commits