fix bugs #248
merge remote master