Fixed merge conflicts
Merge branch 'badele-pelicanthemes-generator'