Fix for issue #115

Here' s a fix for issue #115. I submitted a contributor agreement earlier today.

Thanks!