doh
Merge pull request #230 from nikhan/new_gui

doh