Merge branch 'issue-1'
changes made