Added som new code from Alexis
Merge branch 'master' of https://github.com/Jheral/Vyh_Project_Team3