Merging from OpenWorm before updating with gui code