Fixed issue 2
Merge branch 'bugfix/issue2' into release/1.0