Merge branch 'MoreyBranch'
Fixed result set bug
Removed some test statements
Merge branch 'master' into MoreyBranch
Merge branch 'MoreyBranch'
Merge branch 'master' of https://github.com/bgrayd/Tarsus