Resolves Issue #224