Fix #227
Release v2.0.7