Feature/341

See websharks/s2member#341