Merge pull request #49 from unwin/develop

p12 file management