Fix issue where wrapper and label class options were always set to the default
Merge pull request #1 from robojack/topic/options-inconsistencies

Options inconsistencies - Fixed an issue where wrapper and label options were always set to their default classes.