added extensions
Merge origin/master