Merge pull request #1 from charlesportwoodii/2.0.0-dev

2.0.0 dev - Merge from Head Fork