Merge pull request #1 from emrickgarrett/master

Giant Update 2.0