Feature/changelabels

Fixes #28
Right, missed the cleanup after I moved it.