Merge pull request #88 from Sriii/master

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

teohuei to master