Fixed Master options

Close #100