reorganized source code to better welcome changes later !
Merge remote-tracking branch 'origin/master' into matrix-based-transform
post-merge fixes