This looks hackish
Merge pull request #15 from boiert/master

This looks hackish