Fix issue 5

I wanted to show the problem and a simple fix, unfortunately in order to get the tests to pass I had to hack them up (in probably the wrong way).  Don't have more time to fuss with this so I'm sending it along and leaving the fixing of the tests for you ;-).