Small change to allow a different way of handling the labels. Closes #14