Resolves Issue #219