Fixes for echo extension
Merge pull request #79 from Hutchy68/echo

Fixes for echo extension