Merge pull request #19 from Sriii/master

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

teohuei to master