Fixed TestCase02
Merge remote-tracking branch 'origin/master' into develszaki