Some updates on the original repo and my changes

If this is ain't the salesagility repo anymore you can ignore the PR. ;-)