utils.py updated from master