Merge pull request #7 from sirzxj/master

8
Merge pull request #1 from edsn/master

edit 7