Issue #43 Update