BS 140909 fixbug 30,39,40
Merge remote-tracking branch 'mooc/bs135'