UPR Convert updates
Merge branch 'master' of https://github.com/campminder/client_api_libs