Clean up echo.
Merge pull request #207 from nZEDb/dev

Clean up echo.