Merge pull request #378 from pgreyson/master

Fix label display bug