Merge pull request #2 from OpenBricks/master

Update to June 29 (ee12d0662b)