Resolves #6 and #7.