some update
Merge pull request #13 from databasesystem/wq_branch

some update