Changes made
Merge branch 'issue-3' into develop