pass all test, but not formatted
add comments
Merge branch 'future/netty4'