Merge pull request #21 from CryptoManiac/master