Merge branch 'master' into Gui
gil's version
Merge branch 'Gui'