Merge pull request #12 from xspider/master

sync master
update testcase
Merge pull request #25 from miller/master

update testcases