rainbows
Merge branch 'dev' of github.com:khalua/calcit into dev
merged BMI