Updated for strclipper 1.1.0