Feature/354

See: websharks/s2member#354