mbd commit v1.1

Commit from Macbook