Fix for Issue #90

This includes code that will correct Issue #90.