Updating labels and parameters
Label updates
Merge pull request #7 from brint/master

Label and parameter updates