generic
Merge https://github.com/erickgrimes/BlocksChat