fixed Table bug after shutdown a ws
Merge branch 'dev' into devGUI
minor fixes