Updated fill.py
Merge branch 'master' into new-structure