Updates.
Merge pull request #1 from afollestad/master

Updates.