Fix expansion macro register arguments not being correctly replaced
Update README