Removed empty_name in favor of empty_label
Patch for #222
Merge pull request #223 from rozwell/empty_label

Removed empty_name in favor of empty_label
Merge remote-tracking branch 'upstream/master'