Major refactoring and simplifaction with the idea that it works now better, more robust and more general than before...
Authored by: boescpa 2015-03-04
Parent: [r32376]
Child: [r32378]
