Fix for Issue #48.