fix label()
Merge branch 'develop'