fix bug 1
Merge remote-tracking branch 'origin/fix-bug'