Merge branch 'bugfix/issue2' into release/1.0
Fix issue3
Merge branch 'bugfix/issue3'