Copied new files from uzyn/opauth
Merged updated files