Feature/303

see: websharks/s2member#303