Include #53 option class code
Merge pull request #56 from caseyjhol/master

Include #53 option class code