added token exchange to users module; prepared upstream version 0.1.7