fix #210
Add labeling demo. Fixes #315
Merge pull request #323 from patrickarlt/master

fix #210