Merge pull request #14 from CryptoManiac/current