Merge pull request #1 from fbeuster/flix

merged v8
merge V9 from flix
merge flix (u2,u3,v9)
merged v10 from flix
merged v11 from flix
Merge pull request #2 from fbeuster/CDsBranch

merge CDsBranch to master
added v12,13