done

@qinweigong - plus I updated the android one per your suggestion