Changed the way the mime-type is determined
Merge pull request #935 from delving/13.05_peecho_fix

Changed the way the mime-type is determined