fix
Merge branch 'Bean'