Merge pull request #98 from Sriii/master

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

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

teohuei to master