forgot to merge the branchs.. :D

lacked make branch master merge branch querywriter.. =P