Merge pull request #110 from jungm/jsonp-2.1

Implement JSON-P 2.1