Added labels
Added label options
Merge remote-tracking branch 'labels/master'

* labels/master:
  Added label options
  Added labels