I have opened issue #161 for the two cases and added a new test case that will fail until this issue is fixed. I have some other work to attend to for the next week, so if anyone wants to look at this that would be great. -Steve