using static import for queries now
Merge branch 'master' into step2