fixed timer
Merge branch 'devGUI' into PySide