Resolves Issue #272