#397, make the command line flag slightly less restrictive
#397, make the command line flag slightly less restrictive

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