Merge pull request #1 from oberhamsi/master

Make it work with current stack
Credit Simon Oberhammer's contribution
fix unit test imports