Fixes #153 (Shop Bug #2).
Merge remote-tracking branch 'origin/bugfix/signshopissues' into bugfix/signshopissues