Merge-proto (Short demo!)

by SSJ-FIX (ssjgage) @SSJGage