Fix #9
v1.0.7