Fix keystore generation
Merge pull request #17 from mcanevet/fix_ks_generation

Fix keystore generation