Added android login handler. Did some minor adjustments for class.