pull request for steve_brasier

Hi, paper builds OK on my PC so I hope this is ready for submission.