Merge pull request #24 from TAwesome/Jacob

Jacob