Duncan Bell

This appears to have conflicts, can you please check your commits again?

Hi @JamesFinglas thanks for creating this issue. I will have a look into this. We are also happy to accept PRs via forks from the community. These are the guidelines...