Merge pull request #105 from huangpf/dev

Fix Unit Test