Feature/4

Please see: websharks/hubflow#4