1.0 change dev
merge &fix hey