Feature/116

Please see: websharks/s2member#116