Merge pull request #426 from mamarley/vnstatunderscorefix