Broken but fast

This branch is actually not broken anymore. We fixed it some time ago. :)

Could that be merged into master? Would make deployment on our side easier...

Thanks.