Develop

Hi Jamie,

I've fixed the problem - if you want to pull this back into the main project.
Thanks,
Alex