Updated loader from jasmine branch