Checkpoint source inline with my (attempt) at an updated fork
Merge pull request #1 from ahmedbodi/patch-1

Checkpoint source inline with my (attempt) at an updated fork