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

Next step fixes