remove hardcoded labels (fix #132)
new labels (#132 #129)