Merge in aggregations, closes PR #9