Resolves #54

Primarily for #54.