fix #351
fix #352
Merge remote-tracking branch 'origin/master'