Rudy's awesome commit.
Merge pull request #1 from mikeebert/rudy-branch

Rudy's awesome commit.