Updated to work with new Android API & SDK  and v1