Update for playtest-20131019.
Merge pull request #58 from pchote/playtest-20131019

Update for playtest-20131019.