Updated BMISolver and BMIUI
merged