Added some MIME data
auto-merge staging into master