todo...
Merge branch 'master' of github.com:slimpp/esockd

Conflicts:
	TODO
author