Resolves Issue #13