v2 changes
Merge pull request #4 from frazier02/hotfixv2

v2 changes