more
Merge branch 'joey' of github.com:josephyzhou/eth-go into joey

* 'joey' of github.com:josephyzhou/eth-go:
  merge conflict