Merge pull request #24 from CryptoManiac/master