Working on fix for resultset closed
Merge branch 'master' of https://github.com/amr390/SAT

Merging from several sources