3/storetool: improve
Merge pull request #13 from RavuAlHemio/storetool_fixes

3/storetool: improve