Merge pull request #123 from czardoz/master

fix for #118
Merge pull request #124 from czardoz/master

generation of self-signed certs
added m2crypto