Merge pull request #187 from leeyt/master

Add new testcases