I've reviewed the branch, and pushed my modifications. Nothing exciting: I added an overloaded constructor as discussed before, and made a few minor modifications to the comments. I think it's ok for merging, unless other members of the team want to have a look before.