I merged your master branch back in now. Please merge at your end. Thanks.
Note that the code has not been updated yet.