minor fix
Merge branch 'master' into devGUI
Merge branch 'devGUI' into PySide