Imported sources from hipache project
Forgot one...