Merge pull request #235 from sorenmacbeth/develop

do projection before grouping