Removed global option
Fixed merge issue do to premature commit