Merge pull request #8 from Sriii/master

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

teohuei to master