merge in java changes + another oauth example