add condition and its test
Merge branch 'sec05_test'