Added 'prefix' and 'end_marker' to listing. GitHub #436
Merge branch 'contfilt' into working