John changes, 12/4
Merge pull request #2 from d-eff/origin

John changes, 12/4