Update for playtest-20131130.
Merge pull request #64 from pchote/playtest-20131130

Update for playtest-20131130.