changed things to allow future changes
Merge pull request #27 from Adrian2014/label_upgrade

changed things to allow future changes