Merge pull request #85 from sorribas/master

Add test for cursor explain + a minor change
Merge remote-tracking branch 'upstream/master'