Merge pull request #11 from CryptoManiac/current