closes #59 - labelfix

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'labelfix' into develop