Feature/271

Please see: websharks/s2member#271