Issue #128 -modify android logic