Merge pull request #10 from lkleinberg/master

Content changes.