merging from master all but peer5
merged fixes from Michael to Peer5 module
changed desc and mimetype handling