add test
Merge branch 'release/bug1'