Fix #8
Fix #7
Fix #7
Release 2.0.3