Resolves Issue #202 and #217