started #29 option-math
merged option-math