Merge pull request #5 from CryptoManiac/master