Fix #92
Fix #96
Fix #101
Fix #97
Fix #98
Fix #100
Fix #105