Merge pull request #1 from frazier02/hotfix

Hotfix
Merge pull request #2 from frazier02/hotfix

comments
Merge pull request #3 from frazier02/hotfix

first hotfix
v2 changes
Merge pull request #4 from frazier02/hotfixv2

v2 changes
This is an update from steve
Merge pull request #5 from s-granet/hotfix

Hotfix