added jsonp support
Merge branch 'release/jsonp'