Merge pull request #1 from xdmstc/master

update with the original repo