Adding project as group_by (resolves #11 and also #12).