delano Merge pull request #26 from wuhuaxu/master