fixed #1
Merge branch 'release-2.0.1'