Merge pull request #1 from xdmstc/master

update with the original repo
Merge pull request #3 from ryekee/master

Merge pull request #1 from xdmstc/master