Merge pull request #23 from jharbert/master

Adding underline support