Resolves https://github.com/WebSharks/s2Member/issues/118
Merge pull request #125 from WebSharks/f-s2member-118

Resolves https://github.com/WebSharks/s2Member/issues/118