Made all constants explicit byte strings since they're frequently passed to C
Merge branch 'patch-1'