deleted some lines
working style
Merge branch 'issue3' into develop
working style
working style