Merge pull request #1 from kimmel/master

A few more file types of interest