added issue3
added issue4
Merge branch 'issue4' into dev_2.1