Merge pull request #63 from Sriii/master

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

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

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

master to teohuei
Merge pull request #85 from Sriii/TeoHuei's-branch

teohuei to master