F/merge proto

I really like the prototype change and the fact that it is now automatically done before the virtual function and is not optional.
Great idea.