Adapt to implementation of labelview
Merge pull request #8 from wmde/labelview

Adapt to implementation of labelview