Updated code. Ready to test
Merge branch 'master' of https://github.com/TANguyen1893/DPMGroup3