Merge pull request #112 from flaviogrossi/master

some fixes for the hixie protocol