Merge pull request #1 from Ghost-Sailor/master

dd kbd
Merge pull request #2 from Ghost-Sailor/FixShop

Merge pull request #1 from Ghost-Sailor/master