Resolves Issue #27