Fixed extension list generator
Merge branch 'dev'