Changes made
Merge branch 'issue-1'