Resolves #5 and #7