Merge pull request #27 from ryanleeallred/master

Pull Ryan's Stuff