Resolves #52