Resolves #32