resolves Issue #19