Merge pull request #932 from b4n/filetype_id