fixed some changes got lost somehow. Also the label method could do more
Merge pull request #58 from Nemo64/label-validation-change

fixed some changes got lost somehow. Also the label method could do more