Refactored to create remote version and some comment changes.
Merge origin/master