Fixes #50

I would understand if you felt this was a kludgy way to handle this. If you have a suggestion for a better way, I'd be happy to take another stab at it. :smile: