Josh branch commit
Merge pull request #5 from JeffreyBerger/Josh001

Josh branch commit