added an enum for the options parameter
fixed a resolution problem with an xml comment