modified the Option class to allow a fluent interface via the on method
removed non useful return statement