Updated reflecting Issue #7 improvements