Merge pull request #1 from ecomfe/master

同步er
Merge pull request #2 from ecomfe/master

同步er
add er/util test
Merge pull request #36 from strwind/master

add er/util test