fixed validation
Merge branch 'master' into GUI_Development