Merge pull request #109 from humphd/issue105

[WIP] Failing test for issue 105
Failing test for issue 106