Merge pull request #37 from fgenolini/master

Broken query... removed