added SimpleQuery
Merge branch 'master' of https://github.com/jessepeng/DBS2013
Merge branch 'master' of https://github.com/jessepeng/DBS2013