Small fixings
Merge branch 'master' of https://github.com/ups100/MBI
Reorganizing, need for finding more examples