working under 1.3.4
fix 1.3.4
Merge remote-tracking branch 'origin/master'