Added 'echo' parameter, plus other minor enhancement
Minimal dataset