issue1 added
Merge branch 'issue1' into dev_1.0