fix bug
Merge branch 'dist'