Updated API and @stefanpenner's scroll fix.