Merge pull request #2 from suntinghui/master

android