parse can parse query shape
query shape fixes
Merge branch 'master' into query-shape

Conflicts:
	index.js
Merge pull request #26 from imlucas/query-shape

Query shape