Added disable options and arbitrary string (incl unicode) support