Merge pull request #4 from CryptoManiac/current