Resolves Issue #235 and #246