Support for labels closes #2