#308, regularise the naming of opts, now opts throughout
#308, regularise the naming of opts, now opts throughout

ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake