Revamp
Merge pull request #1 from finespun/changes-after-clone

Revamp