Resolves #1 and #2