optimized grouping to use iterators and vectors rather than functional constructs
Merge branch 'master' of github.com:mahyarr/rocket