Fix issue #9 and restor SQL DSL
Merge pull request #10 from nbessi/fix_db_query

Fix issue #9 and restor SQL DSL