Merge pull request #836 from lzjpaul/cnn-autograd

Update cnn autograd