Merge pull request #69 from chunyeow/master