Added back label creation/deletion (deleted in last commit)
Merge branch 'master' of https://github.com/Kilhwch/Ohtu1