Offers improvements. Resolves #51