would be good to review and merge the changes from ajaxorg and digitialbutter at least for the 0.4x API