Merge pull request #1 from brint/master

Adding parameter groups, updating labels