Flesh out details.
Merge pull request #1255 from williamcheung/master

Flesh out details.