Merge pull request #896 from tonyrd/development

fixes and updates
Merge pull request #898 from tonyrd/development

Bunch of small updates
update MDT - send to friend