nginx support
merge