Resolves Issue #198