Include #53 option class code

#53