Fix issue #7

Sorry @pmjones I wasn't able to get your commits and merge first. Your test case runs here. 

Running out of time.