Pull request from Jacob

Accept my pull request...