Update Netty to 3.6.4.Final
Fixes issue 17
Fixes issue 19
Update issue 21
Merge remote-tracking branch 'origin/master'