Fixed calculation of MB weights
Merge branches 'dev' and 'master'