I sure hope this works this time
Merge pull request #1783 from beardedtim/beardedtim

Merging PR from @beardedtim