minor fix
add additional test case
Merge pull request #31 from MengZhang/develop

Develop pull request from Meng