Merge branch 'dist0.0.4'