Merge pull request #91 from d3scomp/newgen-bures

Tomas merge
Updates, but not working yet.