Merge branch 'master' into searchConstruction
Merge branch 'master' into searchConstruction
merge
minor bugs