added JSONP as possible parameter
Merge branch 'HEAD', remote branch 'origin/master'