Merge pull request #144 from Jedwondle/master

Adjusted package setup and fixed a few classes.
Merge branch 'master' of https://github.com/di2e/openstorefront