Merge pull request #3 from MarwanG/bloc

Checks out fine
Merge branch 'master' into object