Merge pull request #1 from xda/master

Update