some stuff i did months ago
Merge branch 'master' of https://github.com/entice/protocol
Merge branch 'master' of https://github.com/entice/protocol
update