fix hit calculation by calling the proper super constructors
Merge branch 'master' into solution
propagate hit & sink events to the client