Fix problems with the style of labels
Add some missing functions
Merge pull request #1 from martinbi/master

Fixes