Resolves #33, resolves #34.