Merge pull request #57 from TAwesome/Jacob

Jacob