Next step fixes
Merge pull request #122 from fredericBregier/wNetty41

Next step fixes