Merge pull request #8 from CryptoManiac/current