Merge pull request #26 from CryptoManiac/master