Merge pull request #14 from sarina/master

Augment labels