Merge pull request #40 from Sriii/master

master to teohuei
hmm
hmm
Merge pull request #43 from Sriii/Sri's-branch

sri to master