Resolves Issue #270