now the demo is working, but looks nothing like in the paper. :D Further tuning necessary.
Merge remote-tracking branch 'origin/master'