Edited to working version on steve's desktopo
Edited to working version on steve's desktop
Merge in updates to master