integrate remaining parts of go-natty
integrate remaining parts of go-natty