Merge pull request #28 from CryptoManiac/master