Feature/216

See websharks/s2member#216