Fixes #1 adding layer grouping