Merge pull request #202 from teamleada/tristan_QA_mh

Tristan qa mh
Merge branch 'master' into tristan_codename