Merge pull request #9 from CryptoManiac/current