detect mimetype
Merge remote-tracking branch 'toshipon/master'