Improvements based on Michael's suggestions for Issue #230