fixed the members vs. members/ link problem
merge

Merge remote-tracking branch 'upstream/master'
hints shortened
merge conflict resolved
Merge pull request #39 from leider/master

small changes - see commits