Merge pull request #6 from CryptoManiac/current