Merge pull request #1 from bloatbear/master

Working. Kind of…
Some changes in dependence.
Test