Changes to fork on 23greg23
Merge pull request #2 from 23greg23/master

Changes to fork on 23greg23