Merge pull request #54 from TAwesome/Jacob

Jacob