Fix for Issue #35 - from origin