complete working version without inventory overwrite
Merge branch 'master' of github.com:desertplanet/COMPshop