Before request, bug fixes, improuved sample.