Merge pull request #20 from CryptoManiac/master