Merge pull request #7 from oberstet/master

various things
disable nagle algorithm by default
Merge remote-tracking branch 'peter/master'