80% of the work done
Merge pull request #1 from edwardsmit/origin

80% of the work done