second commit on issue#1-editted fixissue1
Merge branch 'issue#1' into dev_1.0