fixbug
Merge branch 'master' into ducvovNew