Merge pull request #294 from dshurt/master

Master
Merge branch 'master' of https://github.com/di2e/openstorefront