Couple of bug fixes and new features
Merge branch 'master' of github.com:iMaxxx/OpenStore
new version