from Ykid
Merge pull request #3 from Ykid/master

Contributor changed.