Redoing changes for #164 from dev branch (#167)
Merge pull request #168 from WebSharks/f-s2member-164-2

Redoing changes for #164 from dev branch (#167)