removed nested labels

removed nested labels & some macros changed to theirs n:attr notation
Merge pull request #115 from iiic/patch-1

removed nested labels