Make creator work with new format
Merge pull request #1 from masto/master

Make creator work with new format