fixed #23, move OptionsCtrl in separated file