1.2.4 Update

Kept byte arrays too, in case you would want to merge instead of doing it yourself.