fix poly assoc and queries
merging

Merge branch 'master' of https://github.com/cdcueva/oliwi into fix-poly-assc
Merge pull request #63 from cdcueva/fix-poly-assc

Fix poly assc