More changes to match porject direction
Merge pull request #26 from Adrian2014/label_upgrade

More changes to match project direction