changes committed from home computer
fixed merge