Fix Issue #18

I opened up https://github.com/pardom/ollie/issues/18.  I have created a fix for the issue and created some unit tests.  I'm not sure if this is the expected behavior, but it seems to be working for me. Hopefully, it helps.