Fix #191 and fix #193
Merge remote-tracking branch 'origin/master'