Joshes changes
Merge pull request #1 from Jraymond/Josh

Joshes changes