Merge pull request #5 from brint/master

Added parameter groups and labels