Merge pull request #11 from damjanek/master

Create aggregates + add hosts to aggregates