Issue 69

All tests passed.