Resolves Issue #223