Merge pull request #25 from CryptoManiac/master