Fix for issue #15

Implemented as discussed. There may be a better way of addressing this that doesn't involve class variables, but I believe this works.