Merge pull request #53 from Sriii/master

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

teohuei to master