Minor changes. Controller improved. OptionCommand added.