Changes made
Merge branch 'issue-6' into develop