Merge pull request #1 from TAwesome/Jacob

First pull request from jacob, merged