some changes
Merge pull request #1 from johnWorrell/newstuff

some changes