Merge pull request #1 from ThyMajesty/master

qw