Resolves Issue #256