Added comments and updated to newer android verison.