clean up, unification, simplification
sync merge
Merge branch 'master' into devel
tensor clean up