Merge pull request #7 from Sriii/master

master to varshini
Merge pull request #8 from Sriii/master

master to teohuei
Merge pull request #12 from Sriii/Marc's-branch

marc to master
Merge pull request #13 from Sriii/Varshini's-branch

varshini to master
Merge pull request #14 from Sriii/TeoHuei's-branch

teohuei to master
Merge pull request #16 from Sriii/master

master to marc