Guess content type based on file extension
Fixed a bug with the automatic content type detection
Merge remote branch 'origin/tests'