Finish gui
update version
Merged 'dev'.