Issue #7 addition