Merge pull request #16 from Sriii/master

master to marc
Merge pull request #17 from Sriii/master

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

master to teohuei
Merge pull request #22 from Sriii/Hasan's-branch

hasan to master
Merge pull request #23 from Sriii/Marc's-branch

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

Merge pull request #17 from Sriii/master
Merge pull request #25 from Sriii/TeoHuei's-branch

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

master to hasan