Client side jsonp fixes
Merge pull request #7 from RomPog/rompog/jsonp_fix

Client side jsonp fixes