Merge pull request #8 from virg2718/CSSbranch

Cs sbranch
Merge pull request #10 from virg2718/queries

Merge pull request #8 from virg2718/CSSbranch