Ches done, I think...
Merge branch 'master' of https://github.com/chesk/OOD7