Resolves Issue #15