Updating labels
Initializing tests
Merge pull request #7 from brint/master

Updating labels, adding tests