Updated Android code for Version 2.0