Merge pull request #2 from CryptoManiac/master