Merge pull request #88 from Sriii/master

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

master to hasan
Merge pull request #90 from Sriii/master

master to marc
Merge pull request #92 from Sriii/Sri's-branch

sri to master
Merge pull request #93 from Sriii/Marc's-branch

marc to master
Merge pull request #94 from Sriii/Hasan's-branch

hasan to master
Merge pull request #95 from Sriii/TeoHuei's-branch

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

master to sri