added query conditions and updated to verions 0.6.0-SNAPSHOT