change output logic
Merge branch 'patch' into test_1.0.0