Refactor; https://github.com/WebSharks/s2member/issues/180
Merge pull request #181 from WebSharks/f-s2member-180

Refactor; https://github.com/WebSharks/s2member/issues/180