Some hacks to make it work
Merge pull request #1 from neurord/master

Some hacks to make it work