linking from the feedback
fixed the links according to the feedback
Merge branch 'issue-186' into develop