* Better formatting of labels.
* Fixes Issue #46