Fix for Issue #99

Not sure if this is the right approach (completely new to git/github), but if I've done everything right, this should contain the fix for issue #99.