Merges Wookey changes in the control file (closes #18)