link changes
Merge branch 'issue-241' into develop