Merged to latest development and updated to v2 of the API