Bug fixed release 0.4.1
Complex query added temporarly