Merge pull request #16 from avsm/mor1-master

Compile with cohttp trunk
Sync CHANGES