merged master in:
keeping webIP
stream now provided
buffer module now updated