build the options gui
Merge origin/master