Update bmg160

Applied recent changes on hydro-devel branch.