Changed / fixed issues caused by pull request #95

This should eliminate all your mentioned issues, except the last one (converting to JSONP), which I'm going to do soon via another pull request.