GUI prompt and other fixes
Merge pull request #46 from buren/gui-prompt

GUI prompt and other fixes