Changed omni_simple_marker to omni_marker.
Added ability to enable/disable omni control.