final commit
final commit
Merge pull request #1 from mrdanding/master

From xia version1