Merge pull request #734 from jmaas/release24

Update kickgen.py