Resolves #78

I filed #78 because it was holding me up at work. It turned out to be rather easy to fix. Let me know what you think.