Improve the echo's
Merge pull request #392 from nZEDb/dev

Improve the echo's