Feature/211

Resolves websharks/s2member#211