Resolves #33 and #34.