Merge pull request #22 from nZEDb/dev

More file count in subject.
Improve detection of file extension.