v1.0.0.1 Fix bug in v1.0.0.0
Merge branch 'v1.0.0.1'