Fixing #2
Merge branch '3.0' of git://github.com/thecodingmachine/database.querywriter into 3.0