Fix #107
Fix #110
Merge remote-tracking branch 'origin/master'