Feature/179 2

Please see: websharks/s2member#179