Resolves Issue #50