Update.
Merge pull request #1 from gmaxwell/updates1

Update.