Handles file extensions itself
Merge pull request #3 from nsendetzky/master

Handles file extensions itself