Resolves Issue #19