Fixed instance/group separation
Merge branch 'master' of github.com:dallingham/regenerate