Merge branch 'master' into newformat
fixed bs1 source files