Fixes for RawOptionSetType changes in beta 6.
Merge pull request #7 from powerje/master

Fixes for RawOptionSetType changes in beta 6.