code optimization
Merge branch 'master' of https://github.com/AndersFB/U-Prove