Jcranmer master

Hi,

I've created a new branch in my fork:jcranmer-master,
where I'm importing changes from my clang branch.