Improved label format detection
Merge pull request #3 from embark/kathy/merge_clabels

Improved label format detection