resolves Issue #17