Feature/293

See: websharks/s2member#293