commit into my unstable branch
Merge branch 'stefan_t1'

merge to master