Fixed #27. Actually a lot easier than I thought it would be.