Merge pull request #51 from chunyeow/master