Also resolves #59