Resolves Issue #190