Merge pull request #1 from chakming/master