bmicalc merge to master