Merge pull request #10 from brint/master

Fixing labels and descriptions