Issue #28 Updated