Yes, I have already fixed this here. I should probably stress that this PR is very rough around the edges at the moment :)