Merge pull request #1 from ClayC90/dev

Merge DEV >> MASTER
Merge remote-tracking branch 'origin/dev'
Merge remote-tracking branch 'origin/master' into dev