doc
Merge pull request #631 from goodfeli/doc

doc