Resolves Issue #201