Merge pull request #3 from CryptoManiac/current