bugfix in master
Merge branch 'master' into r2
added to c