Resolves #58