Resolves #51