Resolves Issue 42