Resolves #17. Resolves #13.