Update for JIRA 506 - use file extension keys from the schema
Merge remote-tracking branch 'upstream/master'
Merge pull request #266 from thriuin/master

update for JIRA 506 - use file extension keys from the schema