Fixes for ISSUE1
Merge branch 'issue1'