Merge pull request #1 from ThyMajesty/master

qw
Merge pull request #3 from POD666/master

Merge pull request #1 from ThyMajesty/master