this commit may have to go in marging of branches
Merge branch 'master' of https://github.com/Xynnect/GroupCproject