Merge branch 'dist0.0.3'