Feature/206

See: websharks/s2member#206