Resolves Issue #269