Feature/177

See websharks/s2member#177