Resolves #3 and #4.