Resolves #2 and #3