Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
add testcase
Merge pull request #435 from cutedemons/master

add testcase