Forgetjsonp

Merge the without jsonp version back to develop, It is working.