Investigating 110

I think I got #110 fixed. All the courtesy of bug catching and fixing should go to @firo222 and @Shihayazad - all I did was put together their work and run all the tests. Please review @jagregory