Merge branch 'master' into release_1.0

update from master because conflicts appeared
cleaned a conflict line
Merge branch 'release_1.0'