Catching end of data support
Merge branch 'dev' of ssh://127.0.0.1:3434/dreyk/etsdb into dev