fixed #1054
Merge remote-tracking branch 'origin/master'