Working. Kind of…
Merge pull request #1 from bloatbear/master

Working. Kind of…