Another one
Merge pull request #639 from gannetson/payback-time

Another one