Resolves Issue #211