version changed
Merge branch 'master' into devGUI