Fixes #74 and resolves #33.