LOTSA CHANGES YO.
Merge pull request #1 from dmuelle2/master

LOTSA CHANGES YO.