Changed version to 1.0 - Beta over
Changed Error Query to true
Merge branch 'master' into GUI