initial commit
Merge pull request #1 from Jkolber/josh

initial merge