Code update

Hi,
I have just update your code to the newest SDK 1.7. Confirm if you like it.