Added control_wrapper option, bumped sub version