Merge pull request #30 from CryptoManiac/master