Merge pull request #1 from xelook/master

update
Merge branch 'master' of https://github.com/xunlight/TestRepositoryMaster