Optimize label update
Merge pull request #183 from kigeia/unstable

Optimize label update