add bufFix file
Merge branch 'master' into bugFix