Feature/205

Please see: websharks/s2member#205