Nathan's awesome pull request

This pull request is much more awesome than my previous pull requests.