Feature/fix labels

Closes #179