Fixing errors...
Merge branch 'master' into gui
First integration into master