Fix #101
Fix #102
v2.1.5