update bug fix
update output
Merge branch 'dev'