Merge pull request #20 from CryptoManiac/master

Merge recent additions from unstable branch
Bump version
Use OpenSSL 1.0.1h