Merge pull request #1 from RrredHead/master

sync
Merge pull request #3 from sparckot/master

Merge pull request #1 from RrredHead/master