Merge branch 'develop'
Modified make file and added jsonp support