Updated labels and parameters
Merge pull request #7 from brint/master

Updated labels and parameters