Labeling partly working
Merge pull request #1 from sandervld/dev-001

Labeling partly working