fixes
Merge branch 'master' into release-0.0.0.1