Merge pull request #1 from brint/master

Updating labels and descriptions