Merge pull request #6 from brint/master

Updating labels, templates, and parameters